Seb, can you please look into cherrypicking this fix from upstream, or delegate to Robert, or toss back to me if you are too busy?
Seb, can you please look into cherrypicking this fix from upstream, or delegate to Robert, or toss back to me if you are too busy?