Merge branch 'release/v5.0.7' into develop
fixed main files
Merge branch 'release/v5.0.8'