Merge unowned piece of code
Update year of the copyright notice