Merge pull request #15884 from kainuk/issue-lab-1365