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

* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes: