Develop without stage conflict tested

Created by: Mohammad-Masoomi-Homayoun

After merging the Stage to Develop and testing I created this branch to merge to develop