Merge pull request #6596 from annando/worker-jpm