[COM-362] COM-362