ENG-6891 Ad hoc logging