merging from 3.0