Merge remote-tracking branch 'origin/main' into connor4312/customizations