Sync with 3.0 branch. No new content.