Merge branch 'main' into fix-966-var-overflow-in-harm-model-ari