Merge pull request #7158 from neheb/hpl