backport c4bd68be5fc6 to 3.2
1 file changed