Merge pull request #16541 from bhahumanists/subtype-issue-991