Merge "Put DessertCase on a diet." into klp-dev