Added community from Oman
merged conflicts
Merge branch 'ty221-master1'