back port fix for #13091

Closes 13089