backport #11575 to 3-2-stable