Merge pull request #3328 from 9rnsr/2.065

Pick up changes from master to 2.065 branch