Merge "refactor - _is_timed_out using instance timeout"