Changes to address [#42710941]. I'm still not enthusiastic about the chain of events that's triggered when the entities are created but that can be cleaned up in a future release.