28e4186835
(cherry picked from commit 2016f11b1c322fcd5f9e2f09328ca19d2114629d) Fixes #3696
(cherry picked from commit 2016f11b1c322fcd5f9e2f09328ca19d2114629d) Fixes #3696