(cherry-picked from 75eb209f72) closes https://github.com/influxdata/feature-requests/issues/612 (cherry picked from commit edbb55777e)
75eb209f72
edbb55777e