Merge pull request #3621 branch 'hotfix/typo'
fix copyright year in new components/source files
Forward port #3644