Merge "proper instance status handling"