[ACS-4.4] cherry-pick

[Jayapal Reddy Uradi]

Hi Daan,

Please cherry pick the following commit to 4.4
a195e50ae7da4b4392844e2984823c1331ca1396

Thanks,
Jayapal