Merge 8.0 Integration to master