Merge branch 'chore/update-copyrights' into 'develop'