Handle latching zeros correctly in SPI.
merge