BUG: 424272 FIXED-IN: 5.19.4 (cherry picked from commit 4921acf4) (cherry picked from commit dccf0ee4)