Merge branch 'hotfix' into release
Merge branch 'hotfix' into release
Merge branch 'hotfix' into release
Fixed CW-696 (Notification not needed)
Removed duplicate files
Merge branch 'release' into sprint-4
Merge branch 'sprint-4' into sprint-5