Merge "Copyright and other information correctness"