Merge "ITM new style component test (empty)"