pr-21624-hmr-circular-imports-diff