Merge pull request #7681 from remitamine/skynewarabia