Merge pull request #14187 from seamuslee001/dev_core_931