perf test for loader.resolve()
Merge branch 'dev-master' into dev-3.x