Merge pull request #7158 from kemal-bay/master