Merge "Fixed misplaced bracket for switch-case block." into klp-dev