Merge "Split long lines (>120)" into stable/boron