Fixes: #10547