Issue #1219658 by jdelaune, Fonant, cam8001: GB specific tweaks, before hopefully a more sustainable solution.