JBDS-2801: Updated TP to use newer GPE