I meant to land this in master before landing it in the server-1.20-branch but I forgot.
server-1.20-branch