Merge pull request #2375 from akarsakov:fix_getGradient