hw ROI - error msg & fix bug
Merge remote branch 'mainstream/master'

* mainstream/master:
  hw ROI - error msg & fix bug