Patch for 4.21

Patch for 4.21