Fixes #1959 (cherry picked from commit 3fb4cdad13) (cherry picked from commit f7d0db69f9)
3fb4cdad13
f7d0db69f9