[OE-3483] Updated GII scaffolding