Merge branch 'bugfix/follow-query-overhead' into 'develop'