Merge pull request #14266 from seamuslee001/dev_core_369