r7730: Some merges