Synchronize with 1.0.0 branch