Fix for components.
Merge branch 'per-module-resolver'
New Build.