issue #19797: Update item and itemsite orm. Fixes for model and workspace.