Feature/maintance 3.x/issue849

maintance pull request for #849