Merge pull request #6031 in master
fix exception message. Must be Stdlib hydrator
Merge pull request #6035
Merge pull request #6035 in develop