[ACS442] merge request

[Pierre-Luc Dion]

Hi Daan,

could it be possible to merge hotfix/4.4-7822  and cherry-pick:
b04cc750652642e8e2593128c7c0f5de3ef6b0d7
into 4.4?

thanks,

PL