Merge pull request #90446 from tshortli/property-wrapper-backing-storage-availability