Merge pull request #5544 from kumpera/verify_byref_return