Merge "Allow getComponentName() to be used in tests" into sc-dev