add watch expression
add timeout fcn
set timeout
Merge branch 'message_status' into testing
timoeout