ENG-5114: keep detailed message