Issue #21628: more fixes to ORMs/views