Merge pull request #10656 from neheb/lcd