(Partial) cgutils migration for arboretum