Merge branch 'feature/follow-import' into 'develop'