Re-apply the follower changes that got lost in the node 10 merge