More 3.0.76 merging.