359.13 XIO refactoring committed