Merge branch 'fix-lcdc-quirk' into fixes