Merge "increase line length to 99"