Tag CLI cleanup

Created by  pmeunier  on July 4, 2021
DX2FO4HZDTTBU436YRPQW3MIIVFB3ZFSZ3SI5GYLTIWCIGRTQ6DAC
Change contents