backport 10845a747904cf2a6ddefbf9b6c07e1d769238c2 to 0.11.1 tag