Upgrading tomas-abrahamsson/gpb