[COM-382] COM-382