Merge branch 'refs/heads/hotfix-db' into ARC/master
Updating some more copyright notices.
Merge branch 'refs/heads/hotfix-notice' into ARC/develop