Merge branch 'fix/follow-import-by-uri' into 'develop'