Ensure custom properties work correctly with inheritance
Merge pull request #15389 from sgrif/sg-property-inheritance

Ensure custom properties work correctly with inheritance