Pull request for merging dev into staging ( #1721, #1291 ) - sprint 41