Update to rev 348