Merge change up to right before new-year copyright bumping