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

Bug 914942: uplift to the leo branch