import changes from 0.31