Merge "Deduplicate status call checks"