Pull Request C5 - Profile - Story 5.8

Issue #206 Reviewers: @Husseny @MussabElDash @nadineadel @linsara