Merge "Fix accidental pass-by-value"