Sync master with 2.0