1.6.4 LCD Display Solution
Merge branch 'hichetu'