Merge branch 'hotfix' into release
Merge branch 'hotfix' into release
Merge branch 'hotfix' into release
Removed duplicate files
Merge branch 'release' into sprint-4