Pulled in changes from 0.30.0