Merge pull request #12259 from seamuslee001/dev_core_163