Merge many fixes

Contains the PR #1893 and a possible fix for the premature RxRingBuffer unsubscription and NPE.
This is rather expensive. It means we are now going to have a `HashSet` allocated for every `merge` and `flatMap`.