Merge "DessertCase fixes:" into klp-dev