Merge "Fix copyright markings"