Merge "Avoid unnecessary object creation"