Merge pull request #9680 from cabalism/test/project-hop-imports