Bug 832239 - uplift to v1-train, continued
Merge pull request #10393 from fabi1cazenave/uplift-bug832239

Bug 832239 - uplift to v1-train, continued