Merge pull request #6062 in master
added missing License header
Fixes #6063
incorporate feedback : patch use Exception, exception message, and @throws docblock
Merge pull request #6067
Merge pull request #6061
Merge pull request #6061 in develop