Same as the previous commit. These commits have significantly reduced the cognitive burden of working on this subsystem. DEV-13708