Issue #21628: Fixed failing tests and view