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

* commit '1aa3202b1bf72bb9a9ec20e60bf7b4fce8369acf':
  Minor fixes: Add a missing "break" and some cosmetic fixes.