Merge "Fix broken createArchives task." into nyc-support-25.2-dev