NG-13332: added some debug support