fix test
merge 0.19.x branch into master