Merge 1.13 snapshot