merge 3.0.74 edits