Merge "Add/fix copyright notices"