359.12 XIO refactoring checkpoint