Merge pull request #4076 from ghedo/direct_type