XX-10566: proper copyright
Merge branch 'XX-10566' into release-4.6-unstable