LPS-41541 Handling of preloaded entities for global and local scope