Merge 3.5 (NEWS)