ESSENTIALS-441: sync'ed archetype to 7.9 maintenance branch.