Merge "Fix bugprone-copy-constructor-init warnings"