Resolves #1937 (cherry picked from commit bf04107048)
bf04107048
(cherry picked from commit 9e4eb18290)
9e4eb18290