[artf999348] Completed atg demo changes in archetype