Backport PR #9705 on branch v2.1.x #9710
+19
−0
Merged
8000