0b37ce8baf
Originally proposed in #8959 (cherry picked from commit 8d7a7919a9bc4b3e2242486c16d0c8b947e8ab64)
Originally proposed in #8959 (cherry picked from commit 8d7a7919a9bc4b3e2242486c16d0c8b947e8ab64)