merges from 3.0