Merge pull request #14207 from seamuslee001/dev_core_940