release/18.x branch, commit 78b99c73ee4b96fe9ce0e294d4632326afb2db42
upstream commit 0604154e006e88e9e7f82d8ee5fd076bda206613