am 1cd74aca: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev

* commit '1cd74acaf917c1c8517ea923a2b14ee07255e4f1':
  Minor fixes: Add a missing "break" and some cosmetic fixes.
tree: a495d51b12457450710301e205c3dd098b703982
  1. core/
  2. services/