Fix for #2511
Merge branch 'v1.13.x' into next