Merge "Fix status_timeout incorrectly referencing self"