Merge pull request #15404 from seamuslee001/dev_core_861