Backporting PR #499 to `v4.4-branch` as part of the next `tiacsys/v4.4.1` release
Backporting PR #499 to
v4.4-branchas part of the nexttiacsys/v4.4.1release