Merge pull request #9674 from neheb/lcd2