Fixes #10319 and #10309. Based on 89c9a3ac3542c3684e511607d88b265bfa6aa64f. (cherry picked from commit 1e413487bf8ff413796d1cf1d9adafcd36f04444) Signed-off-by: Anton Khirnov <anton@khirnov.net>
Fixes #10319 and #10309. Based on 89c9a3ac3542c3684e511607d88b265bfa6aa64f. (cherry picked from commit 1e413487bf8ff413796d1cf1d9adafcd36f04444) Signed-off-by: Anton Khirnov <anton@khirnov.net>