Merge branch 'fix/unsubscribe-route' into 'develop'