Merge pull request #17906 from seamuslee001/lab_core_1846