Merging patch to add lcc