<DA-431> fix unsubscribtion problem
<unstable> Merge branch 'DA-431' into unstable