Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'