Adding patch for 10.1.x version.