7.x-2.21
cd330a73 · Issue #1172996: Track recent changes in #299138. ·