Merge pull request #7827 from habi/master