Updated for 4.2 rev 2055