Merge "Update repository with new location of XCI"