Merge "Adds additional crlf clobber avoidance."