ESSENTIALS-310 Sync up with latest R&D archetype changes

* merged relevant changes (we don't have templates, components etc)
Merge branch 'archetype-merge'
- disble test