[ACS441] Hotfix merge request

[Amogh Vasekar]

Hi,

Can you please merge hotfix/4.4-6905 to 4.4 so that the issues get fixed
in 441?

Thanks,
Amogh