Merge pull request #14577 from mattwire/type_consolidation