JBDS-2801: Update to newer GPE