Update to rev 2674