Fixed file header
Merge commit 'acd0e3562e8486fc62db35b86149bcba3ea41b81'

Merges from subprojects