release/18.x branch, commit 78b99c73ee4b96fe9ce0e294d4632326afb2db42
release/17.x branch, commit 8f4dd44097c9ae25dd203d5ac87f3b48f854bba8