Merging from 3.0.76 vanilla.