Bug 1020667 Add support for JPM