Merge pull request #14368 from seamuslee001/dev_core_996