Backport #11575 to 3-2-stable

#11575
/cc @spastorino