refs #30645
Merge remote-tracking branch 'origin/bugfix/gpdb-header'