Rebuild and merge with 3.13