fatima_dev #6

Open
Fatimah wants to merge 3 commits from fatima_dev into faiz_development_common