XD-1947 - Fix @CliAvailabilityIndicator for many commands