Updated copyright
Merge remote-tracking branch 'origin/feature/next' into feature/next