Merge pull request #6062 in master
added missing License header
Merge pull request #6061
Merge pull request #6061 in develop