Merge "Modify component changes"