Merge pull request #1856 from bendiy/4_7_x