Merge "Remove line break." into klp-dev