Merge pull request #1683 from bendiy/4_6_x