Merge "Fix invalid assertIsNone state"