Allow for component re-use.

@bug W-2085617@

@rev eric.anderson@
Merging origin/goliver/master-pending-clear-references into master