Merge pull request #3791 from mmastrac/master

Avoid unsafe when sizing types