Merge "Fix tag skip and add tests for component-override"