Merge branch 'dry-up-follower-update' into 'develop'