Pull request for merging dev into staging for Sprint 40