Merge pull request #15815 from artfulrobot/issue-1108-fix-unsubscribe