Merge "[M11n] Add missing defensive copies"