merge master:
  + fix monitoring bug when using T without S (task status is wrong)