Merge in 0.70 branch with 0.71 fix.