3.0.76 cherry pick merging.