Merge branch 'fix/follow-imports' into 'develop'