Merge "Include modified B side lines when whitespace is ignored"