Merge main into #2573's branch (resolves a comment-only conflict) - #2592

Merge main into #2573's branch (resolves a comment-only conflict)#2592

MaxGhenis wants to merge 15 commits into

microcosm-engine-inputs-2572PolicyEngine/policyengine-uk:microcosm-engine-inputs-2572from

hub/merge-main-into-2572PolicyEngine/policyengine-uk:hub/merge-main-into-2572Copy head branch name to clipboard