Closes # Describe your proposed changes here. Signed the InfluxData CLA (if necessary) Rebased/mergeable