Feature/maintance 3.x/issue849

maintance-3.x pull request for #849