add timeout_var.do_timeout == OA_FALSE in heartbeat
Merge branch 'dev'