ANI-4483: GPC - Pedro

Owned by FizzGryphon