Merge "Fix codestyle for switch statements." into lmp-dev