Testing pull request from a story branch.
Merge pull request #3 from islammenshawy/feature/CMSSHRII-284

Accepted first checkin for story CMSSHRII-284.