Merge "text changes requested by Legal"