Merge "Avoid reentrant pipeline run" into main