Merge branch 'release/r8'
Removing wrong files
Merge branch 'hotfix/oldfiles' into develop