Merge branch 'follower-mrf-again' into 'develop'