Merge pull request #21838 from christianwach/lab-core-2917