Add 3.0 master merge note