Merge branch 'fix/following-request-from-deactivated' into 'develop'