Fixes #10319 and #10309. Based on89c9a3ac35. (cherry picked from commit1e413487bf) Signed-off-by: Anton Khirnov <anton@khirnov.net>
Fixes #10319 and #10309. Based on89c9a3ac35. (cherry picked from commit1e413487bf) Signed-off-by: Anton Khirnov <anton@khirnov.net>