c13943ba95
Fixes #8811 Fixes #8812 (cherry picked from commit 50d46fe7f69fd35e7307760dd5fc849b5f9987de)
Fixes #8811 Fixes #8812 (cherry picked from commit 50d46fe7f69fd35e7307760dd5fc849b5f9987de)