Merge pull request #16375 from seamuslee001/dev_core_1538