merged changes from 3.0 tree