Sync to upstream (update rendering_types)