Merge "Fix unnecessary copy initialization warnings"