ADD Patch for r6732

Commit never landed in 3.54, and we need it for stability