This commit alone does not fix anything nor modifies existing interfaces or behaviors, although it is a prerequisite for other fixes.