Add patch for ZSRV-11843