- Backport map maker workflow fix for #2221