Fixed missing copyright notices
Merge branch 'master' into 147-backport