User integration test fixed again...
Merge ../x0y0