Merge branch 'cache-follow-state' into 'develop'