Fixes: #19258 (cherry picked from commit cbb6c000) (cherry picked from commit e55a705a)
mentioned in commit 3acf1d97