Merge "Updating the copyrights"