Sync up with the latest semi-1_13 branch.