Split into a separate patch to avoid rebasing conflicts and to split from functional changes.
d34418100b