Merge pull request #15283 from christianwach/lab-1200-3