Merge pull request #12277 from seamuslee001/dev_core_163