Merge "Fix ownership for ComponentOptions" into main