Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
tree: a495d51b12457450710301e205c3dd098b703982
  1. core/
  2. services/