changes from 3.0.5 stable