JAL-3493 fix patch for 2.11.1_js (nb - these changes should not be merged to 2.11.2!)