Merge pull request #15962 from seamuslee001/dev_core_1422