Merge pull request #13194 from seamuslee001/lab_core_498