Merged from master - fix archetypes