Merge pull request #15737 from neheb/jpgt