Pull request: C5_Amir_443_edit_contest_5.17

#443 @MussabElDash @Husseny please review.
@linsara @nadineadel you may want to wait on the scenario review until my other pull request #513 is merged on master because I am depending on the validations from that story.