Merged in release_13 branch.