Fixes: #10547

#10547