CB-6648 Adding a flag for experimental features
CB-6649 Removing experimental flag from positional arguments