Merge pull request #3716 from vargaz/unbox-stobj-null