Merge pull request #3081 from akarsakov:small_fixes