3.0 sync with master