Merge "Update and fix licence headers in archetypes"