Merge branch 'main' into limit_artifact_lifetime_explicitly