[OE-3839] Consistent field spacing