COMMANDBOX-89 Added bleeding edge support