Changing the deployments markers.
Merging code from @stianst
Fix IdentityManagerProducer