merge 3.5.0b3 changes from 3.5