85ed6ee
Resolves: upstream#3621 - backport bug fix found by static analyzers (cherry picked from commit 5eba7a8f1fa4149aed673d8d5f6c624368ac6875) (cherry picked from commit 21443e5ebe3c9d0b19f075d545cf49d0d2aa6f91)