Merge branch 'main' into item_generation_scripts