Pull request for merging dev into staging ( org view page problem ) - sprint 40