ENG-5824 bullet-proof the progress monitoring