Merge many fixes

Contains the PR #1893 and a possible fix for the premature RxRingBuffer unsubscription and NPE.