am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev

* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
  DessertCase fixes: