Merge pull request #10026 from fabi1cazenave/autoBrightness-bug832239
Merge pull request #10084 from fabi1cazenave/uplift-v1train-bug832239

Uplift to v1-train, bug 832239