Added patch for version 3.0 r4074