which was added by upstream pull request #2523, upstream commit fa6656eeb8eb0d6a9cd40827a7843a3eba9e3fa1. PR: 236132 Submitted by: romain@