NX-685: Added diagnostic logs