Merge "Only try to show character difference if it isn't empty"