Update files to match v3.0 branch
6 files changed