Merge many fixes

Contains the PR #1893 and a possible fix for the premature RxRingBuffer unsubscription and NPE.
Just confirming my understanding, this is making unsubscribe/release idempotent or is there some other reason?