Merge branch 'main' into 22-add-foa-item-generation-to-scripts