Merging with changes on Chocolate