Merge "Fix component creation"