Merge "Use API to check for the superivion component." into tm-dev