[ACS44] CS6850

[Sebastien Goasguen]

Daan,

Can you cherry-pick:
a1f278e9d47e8029d58df6d3aae13495965ca434

from 4.4 forward, it fixes CS-6850

thank you

-sebastien