Merge pull request #15092 from christianwach/lab-1196