Merge pull request #11923 from lcdservices/GL-44