Merge pull request #19061 from christianwach/lab-core-2217