added support for unsubscribing single single
Merge remote-tracking branch 'origin/development' into development