Top-level entities without parametrization - causing error

[khameeteman]

We have rolled back the environments and will work on creating a fix for the issue.