Fixes: #19258 (cherry picked from commit cbb6c000) (cherry picked from commit e55a705a) (cherry picked from commit 270716d9)