Merge pull request #3066 from vpisarev:minor_fixes