Today
merge from fix_icon_generator_hide_during_render -> main