Merge pull request #5248 from vjpai/ccc

Copyright fix