Merge "Fix tabs inside/between statements/text"