Merge "Add method to check to see if the component is the supervison component." into tm-dev