Ticket #990: Done for Al-Masry Al-Youm as well
Merge branch 'develop'