Merge branch 'dev-util/update-copyright'