Merge pull request #15997 from seamuslee001/dev_core_1166