Merge pull request #16639 from seamuslee001/dev_core_1621