Consolidated
and a test
Pulled from svn-2048
Merge branch 'consolidateComponents' into svn-r2048