Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'