Backport of the #1417 from the `develop` to the `release/0.8` branch
Backport of the #1417 from the
developto therelease/0.8branch