Bug 914942: uplift to the leo branch
Merge pull request #13402 from fabi1cazenave/uplift-bug914942

Bug 914942: uplift to the leo branch