PAT fix to deal with GTs with added payloads
Merge pull request #5053 from Martin-Grunewald/PATfix

PAT fix to deal with GTs with added payloads