Reduced the number of subscriptions substantially.
Fixed the disposable implementation.
Merge branch 'tracking-3.1.1' into tracking-3.2