Merge 11.8.0 changes into master