SONARDOTNT-27 LCOM4 support