Refactored component matching.
Merge branch 'master' into staging