Merge pull request #13344 from seamuslee001/unit_test_13343