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