[COM-381] COM-381