Merge pull request #6516 from Zuhayr/dev

Dev