[COMMANDBOX-572]