Merges in LCD branch changes