PDI-10991 - Adding support for overridable properties in shims