92488d5a3c
Fixes #6414 (cherry picked from commit 44ea09e7ad0123b8486428c1ceaeeb96b5c01d35)
Fixes #6414 (cherry picked from commit 44ea09e7ad0123b8486428c1ceaeeb96b5c01d35)