TODO: git cherry-pick b1f9ea754c80e3c7cba0706a1d1dfb24b63c9403 on stable-14.10.x once XS 14.10.19 has been released