Bug fix in unsubscribe
Merge branch 'develop-fftf'