Merge branch 'better-following' into 'develop'