CUST-185 - Patch Request for JPMorgan Chase for PDI-13204

Please review before merge. Original fix of PDI-13204