Pull request for merging hotfix from staging to dev ( Sprint 41 )