Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'