backport to 3.10.17 bsp 1.0.0