[COM-387] COM-387