[COMMANDBOX-325]