359.11 XIO refactoring checkpoint