Adding bug fix info for #19963 for inclusion in 2.8.1 release.