Merge with 1.0.1.x r731: