Merge 3.5 (namereplace)