There is no PR for this, since it was an embargoed fix before disclosure. (cherry picked from commit 32e67eba8b)
32e67eba8b
(cherry picked from commit d99c868b04)
d99c868b04