Merge "Fix archetypes merge jobs"