bmcelvee Merge pull request #60534 from jneczypor/OSDOCS-4459