Update from test rev 80