2.91.08 revert merge gfx/common