Merge "Update component" into main