backport 3.13 2