Fix local build
Merge remote-tracking branch 'origin/artifact-delivery' into artifact-delivery