Merge pull request #14637 from seamuslee001/unit_test_dev_core_1069