Fix/3.2/issue2434 - backport