ba5efa8aa4
Fixes #11420 --------- Co-authored-by: Charlie Marsh <charlie.r.marsh@gmail.com> Co-authored-by: Filippo Vicentini <filippovicentini@gmail.com>