Merge pull request #6637 from annando/fix-jpm