MDL-37596 optionally enable CLI maintenance later