Migrate to Influx command manager and pull all recent changes from the 2.x branch