Merge pull request #15257 from seamuslee001/dev_core_1244