Apply patch for ZF-9706 issue